Bug 548354 – Remove repeated code in gtk_cell_view_size_allocate

2008-08-19  Björn Lindqvist  <bjourne@gmail.com>

	Bug 548354 – Remove repeated code in gtk_cell_view_size_allocate

	* gtk/gtkcellview.c (gtk_cell_view_size_allocate): Remove some
	code duplication, no need for separate loops for GTK_PACK_START
	and GTK_PACK_END.

svn path=/trunk/; revision=21158

diff --git a/ChangeLog b/ChangeLog
index 5e95706af88c90eb4e5f0bd1d79a81a75ac75c2a..84845db98ddb88db04f02a58d69790207b754609 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-19  Björn Lindqvist  <bjourne@gmail.com>
+
+       Bug 548354 – Remove repeated code in gtk_cell_view_size_allocate
+
+       * gtk/gtkcellview.c (gtk_cell_view_size_allocate): Remove some
+       code duplication, no need for separate loops for GTK_PACK_START
+       and GTK_PACK_END.
+
 2008-08-19  Johan Dahlin  <johan@gnome.org>
 
        * gtk/gtk-builder-convert (GtkBuilderConverter._parse): 

diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index 08cd400a95d0520f349cfbd3dabe3d6980adf87a..144feba00b9b4e51485560d22a4f559887071e23 100644 (file)
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -381,32 +381,15 @@ gtk_cell_view_size_allocate (GtkWidget     *widget,
   else if (extra_space > 0 && expand_cell_count > 0)
     extra_space /= expand_cell_count;
 
-  /* iterate list for PACK_START cells */
   for (i = cellview->priv->cell_list; i; i = i->next)
     {
       GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data;
 
-      if (info->pack == GTK_PACK_END)
-        continue;
-
-      if (!info->cell->visible)
-        continue;
-
-      info->real_width = info->requested_width + (info->expand?extra_space:0);
-    }
-
-  /* iterate list for PACK_END cells */
-  for (i = cellview->priv->cell_list; i; i = i->next)
-    {
-      GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data;
-
-      if (info->pack == GTK_PACK_START)
-        continue;
-
       if (!info->cell->visible)
         continue;
 
-      info->real_width = info->requested_width + (info->expand?extra_space:0);
+      info->real_width = info->requested_width +
+        (info->expand ? extra_space : 0);
     }
 }